Further tweaks for Windows deployment. This was used for the 302 beta.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4768 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gui/makesetup.bat b/gpsbabel/gui/makesetup.bat
index 8da542db2276c5052618abbebce2413bf8486e64..1a0b8cc9e3af688f9e74b53a3001a987739bc94d 100644 (file)
--- a/gpsbabel/gui/makesetup.bat
+++ b/gpsbabel/gui/makesetup.bat
@@ -4,7 +4,7 @@ rem Copy the Qt stuff into a local directory. The Inno Setup compiler
 rem cannot handle %QTDIR environment variable in the source file\r
 rem specification\r
 \r
-echo on\r
+echo off\r
 rd /q /s qtdir\r
 mkdir qtdir\r
 mkdir qtdir\bin\r
@@ -16,7 +16,7 @@ mkdir qtdir\mingw
 \r
 rem Basic Qt runtime DLLs\r
 rem  if "%QTDIR%"=="" call \QtSDK\Desktop\Qt\4.7.4\mingw\bin\qtenv2.bat\r
-if "%QTDIR%"=="" call \Qt\Qt5.2.1\5.2.1\mingw48_32\bin\qtenv2.bat\r
+rem  if "%QTDIR%"=="" call \Qt\Qt5.2.1\5.2.1\mingw48_32\bin\qtenv2.bat\r
 if "%QTDIR%"=="" set QTDIR=\Qt\Qt5.2.1\5.2.1\mingw48_32\r
 copy %QTDIR%\bin\Qt5Core.dll qtdir\bin\r
 copy %QTDIR%\bin\Qt5Gui.dll qtdir\bin\r
@@ -24,10 +24,10 @@ copy %QTDIR%\bin\Qt5Webkit.dll qtdir\bin
 copy %QTDIR%\bin\Qt5Xml.dll qtdir\bin\r
 copy %QTDIR%\bin\Qt5Network.dll qtdir\bin\r
 rem copy %QTDIR%\bin\mingwm10.dll qtdir\bin\r
-# Because *obviously* libraries should live in the bin directory...\r
+Rem  Because *obviously* libraries should live in the bin directory...\r
 copy %QTDIR%\bin\libwinpthread*.dll qtdir\bin\r
-copy %QTDIR%\bin\libgicu*.dll qtdir\bin\r
-copy %QTDIR%\bin\libgstdc++*.dll qtdir\bin\r
+copy %QTDIR%\bin\icu*.dll qtdir\bin\r
+copy %QTDIR%\bin\libstdc*.dll qtdir\bin\r
 copy %QTDIR%\bin\libgcc_s_dw2-1.dll qtdir\bin\r
 \r
 rem Image format plugins needed at runtime, but not debug verions\r
@@ -40,11 +40,12 @@ rem Mingw runtime support
 copy %QTDIR%\..\mingw\bin\mingwm10.dll qtdir\mingw\r
 \r
 rem Copy QT's own translations (Apply/OK, and the like)\r
-copy %QTDIR%\translations\qt_*.ts qtdir\translations\r
 copy %QTDIR%\translations\qt_*.qm qtdir\translations\r
 del qtdir\translations\qt_help*\r
 \r
-rem Generate the compiled translations\r
+rem Generate the compiled translations.  All of this makes sense only if\r
+rem the you're doing releases strictly \r
+rem  copy %QTDIR%\translations\qt_*.ts qtdir\translations\r
 rem lrelease gpsbabel_de.ts\r
 rem lrelease gpsbabel_es.ts\r
 rem lrelease gpsbabel_fr.ts\r
@@ -58,8 +59,6 @@ rem lrelease gpsbabelfe_it.ts
 rem lrelease gpsbabelfe_ru.ts\r
 rem for /f %%a in (dir /b *.ts) do lrelease %%a\r
 \r
-copy ..\msvc\Expat\libexpat.dll release\r
-\r
 "c:\Program Files\Inno Setup 5\ISCC.exe" setup.iss\r
 \r
 rem cleanup\r

diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss
index b4530ef8d37092af7d8f85d89f3d5e68782b6f85..0f85968a721d5c4092665b6fbd47676cec02648b 100755 (executable)
--- a/gpsbabel/gui/setup.iss
+++ b/gpsbabel/gui/setup.iss
@@ -16,7 +16,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017}
 AppName=GPSBabel
-AppVerName=GPSBabel 1.5.0-beta20140214
+AppVerName=GPSBabel 1.5.0-beta20140302
 AppPublisher=GPSBabel
 AppPublisherURL=http://www.gpsbabel.org
 AppSupportURL=http://www.gpsbabel.org
@@ -24,7 +24,7 @@ AppUpdatesURL=http://www.gpsbabel.org
 DefaultDirName={pf}\GPSBabel
 DefaultGroupName=GPSBabel
 OutputDir=release
-OutputBaseFilename=GPSBabel-1.5.0-beta20140214-Setup
+OutputBaseFilename=GPSBabel-1.5.0-beta20140302-Setup
 SetupIconFile=images\babel2.ico
 Compression=lzma
 SolidCompression=yes